From 10c670831e5f98254393a750bdbdb476c5c81db6 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 8 Nov 2016 17:32:21 -0800 Subject: [PATCH] Set OPENSSL_DIR for CI --- .travis.yml | 2 ++ Makefile.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7e61d7e28..7b946c018 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ matrix: MACOSX_DEPLOYMENT_TARGET=10.7 os: osx before_install: + - export OPENSSL_DIR=`brew --prefix openssl` - export OPENSSL_INCLUDE_DIR=`brew --prefix openssl`/include - export OPENSSL_LIB_DIR=`brew --prefix openssl`/include - env: TARGET=i686-apple-darwin @@ -33,6 +34,7 @@ matrix: CFG_DISABLE_CROSS_TESTS=1 os: osx before_install: + - export OPENSSL_DIR=`brew --prefix openssl` - export OPENSSL_INCLUDE_DIR=`brew --prefix openssl`/include - export OPENSSL_LIB_DIR=`brew --prefix openssl`/include diff --git a/Makefile.in b/Makefile.in index da0b097ff..0c2ca69a3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -251,10 +251,12 @@ target/openssl/$(1).stamp: target/openssl/openssl-$$(OPENSSL_VERS).tar.gz \ # variables read by various build scripts to find openssl cargo-$(1): export OPENSSL_STATIC := 1 +cargo-$(1): export OPENSSL_DIR := $$(OPENSSL_INSTALL_$(1)) cargo-$(1): export OPENSSL_ROOT_DIR := $$(OPENSSL_INSTALL_$(1)) cargo-$(1): export OPENSSL_LIB_DIR := $$(OPENSSL_INSTALL_$(1))/lib cargo-$(1): export OPENSSL_INCLUDE_DIR := $$(OPENSSL_INSTALL_$(1))/include test-unit-$(1): export OPENSSL_STATIC := 1 +test-unit-$(1): export OPENSSL_DIR := $$(OPENSSL_INSTALL_$(1)) test-unit-$(1): export OPENSSL_ROOT_DIR := $$(OPENSSL_INSTALL_$(1)) test-unit-$(1): export OPENSSL_LIB_DIR := $$(OPENSSL_INSTALL_$(1))/lib test-unit-$(1): export OPENSSL_INCLUDE_DIR := $$(OPENSSL_INSTALL_$(1))/include -- 2.30.2